merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 24 Dec 2010 08:47:22 +0000 (17:47 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 24 Dec 2010 08:47:22 +0000 (17:47 +0900)

Trivial merge